Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 29 Jul 2011 06:53:26 +0000 (23:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 29 Jul 2011 06:53:26 +0000 (23:53 -0700)
commit6f787f21b9eda668a77019d2b385cfc0f422e7d0
tree9631902df60cd8474c1f1162d10cbad38d94003a
parent2d30cab138ff811e172200b787e425be534821b4
parenta0f8eb9a1bcb50d9b7eaf280bdc4af0ecf792353
Merge from trunk.